Update production by Kurocon · Pull Request #1313 · Inter-Actief/amelie

Kurocon · 2026-08-07T11:36:59Z

New features:

Publicly visible enrollments
Declaration forms via website
Digital signatures for memberships and mandates
Personal tab template renames
Educational Bouquet -> Cake
Redirect back to page after login
Select all memberships for debit instead of only this year
Article editing by board from price list in personal tab
Dependency updates

I also updated the enrollments visibility for committee. They can now see all names that are public in their overview, and all private names become "anonymous", unless they deanonymise the enrollment list. I also removed the "edit enrollment" and "deregister" columns from the deanonymized column for anyone that is not board.

…t-preference

…ble for normal members.

…plate for the declaration

…e unnecessary

…ize to settings

…l file for the decla email; added cleaner for the form; on save of form an email is sent to the decla email; added admin model; added formview for the form. Did migration for adding the declaration model

…ed declaration email

…. Adding frontend and backend check for maximum number of files.

…ot get saved in the bookkeeping for each declaration.

…ze instead of individual file size

…ent method is something other than 'Bank Transfer'

…han Personal Bank is selected

… non-blank description

Transition from Educational Bouquet to Cake

Currently translated at 100.0% (3117 of 3117 strings) Co-authored-by: Lars Kruitwagen <kruitwagenly@inter-actief.net> Translate-URL: https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/ Translation: Amelie/Amelie

Translations update from Inter-/Actief/ Weblate

…adding and editing articles on the price list

- removed the category column because categories are an entire row and including the column leaves empty cells - added € to the table header

Redirect back to page you were on when logging in

github-actions · 2026-08-07T11:37:13Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (a327a67).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit a327a67f8990c71fb4cddd12fc127d2b7c1ef0c2 (pull_request/main)
Merge: 48dc3a4 8f1a089
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Mon Aug 3 10:17:19 2026 +0200

    Merge pull request #1312 from Inter-Actief/1311-auth-redirect
    
    Redirect back to page you were on when logging in

It is possible to fast forward production (63fc753) to main (a327a67). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…-gte-2.49.1-and-lt-2.57 build(deps): update google-auth requirement from <2.54,>=2.49.1 to >=2.49.1,<2.57

github-actions · 2026-08-08T09:35:46Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (d0e944f).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit d0e944f62668471aa5977a14dc2849421628bd41 (pull_request/main)
Merge: a327a67 60a8c46
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 11:35:31 2026 +0200

    Merge pull request #1295 from Inter-Actief/dependabot/pip/google-auth-gte-2.49.1-and-lt-2.57
    
    build(deps): update google-auth requirement from <2.54,>=2.49.1 to >=2.49.1,<2.57

It is possible to fast forward production (63fc753) to main (d0e944f). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…h-toolkit-gte-1.7.1-and-lt-3.4 build(deps): update django-oauth-toolkit requirement from <3.3,>=1.7.1 to >=1.7.1,<3.4

…12.1.1-and-lt-12.4 build(deps): update pillow requirement from <12.3,>=12.1.1 to >=12.1.1,<12.4

github-actions · 2026-08-08T09:36:28Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (d3ad9a2).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit d3ad9a2dde8ff2bfc8924862130b88ef302bd9cf (pull_request/main)
Merge: d0e944f b89c8f5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 11:35:55 2026 +0200

    Merge pull request #1296 from Inter-Actief/dependabot/pip/django-oauth-toolkit-gte-1.7.1-and-lt-3.4
    
    build(deps): update django-oauth-toolkit requirement from <3.3,>=1.7.1 to >=1.7.1,<3.4

It is possible to fast forward production (63fc753) to main (d3ad9a2). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…er-gte-25.2-and-lt-27 build(deps): update django-filter requirement from <26,>=25.2 to >=25.2,<27

github-actions · 2026-08-08T09:37:25Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (1616f0c).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit 1616f0cb6dbb8458860490eca0ea7ae90c53df4c (pull_request/main)
Merge: d3ad9a2 935b1ee
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 11:36:13 2026 +0200

    Merge pull request #1297 from Inter-Actief/dependabot/pip/pillow-gte-12.1.1-and-lt-12.4
    
    build(deps): update pillow requirement from <12.3,>=12.1.1 to >=12.1.1,<12.4

It is possible to fast forward production (63fc753) to main (1616f0c). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

github-actions · 2026-08-08T09:37:45Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (3b6183b).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit 3b6183b42837d555a540e44ea767b9642c8230e4 (pull_request/main)
Merge: 1616f0c 97224bb
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 11:36:48 2026 +0200

    Merge pull request #1298 from Inter-Actief/dependabot/pip/django-filter-gte-25.2-and-lt-27
    
    build(deps): update django-filter requirement from <26,>=25.2 to >=25.2,<27

It is possible to fast forward production (63fc753) to main (3b6183b). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

Updating the PR template

github-actions · 2026-08-08T10:26:58Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (bf84451).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit bf84451190d4a3082611eb3dd6b3cf17296129cd (pull_request/main)
Merge: 3b6183b ed1eea8
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 12:26:43 2026 +0200

    Merge pull request #1293 from Inter-Actief/update-pr-template
    
    Updating the PR template

It is possible to fast forward production (63fc753) to main (bf84451). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…-selectable-direct-debit Making ended memberships selectable for direct debits

github-actions · 2026-08-08T10:27:56Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (3fbc17d).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit 3fbc17d2e8db5a31cea68b8c8b8aea9e52d64536 (pull_request/main)
Merge: bf84451 ca70e12
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 12:27:43 2026 +0200

    Merge pull request #1302 from Inter-Actief/1301-ended-membership-fees-selectable-direct-debit
    
    Making ended memberships selectable for direct debits

It is possible to fast forward production (63fc753) to main (3fbc17d). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

…o they can be re-activated

1254 editable price list

github-actions · 2026-08-08T11:05:08Z

Triggered from #1313 by @Kurocon.

Checking if we can fast forward production (63fc753) to main (1ca4c61).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit 1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa (pull_request/main)
Merge: 3fbc17d 3ea9b3b
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 13:04:55 2026 +0200

    Merge pull request #1309 from Inter-Actief/1254-editable-price-list
    
    1254 editable price list

It is possible to fast forward production (63fc753) to main (1ca4c61). If you have write access to the target repository, you can add a comment with /fast-forward to fast forward production to main.

Kurocon · 2026-08-08T13:24:27Z

/fast-forward

iabeheer · 2026-08-08T13:24:43Z

Triggered from #1313 (comment) by @Kurocon.

Trying to fast forward production (63fc753) to main (1ca4c61).

Target branch (production):

commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Tue Jul 14 09:46:19 2026 +0200

    Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
    
    Unpaid memberships overview

Pull request (main):

commit 1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa (pull_request/main)
Merge: 3fbc17d 3ea9b3b
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date:   Sat Aug 8 13:04:55 2026 +0200

    Merge pull request #1309 from Inter-Actief/1254-editable-price-list
    
    1254 editable price list

Fast forwarding production (63fc753) to main (1ca4c61).

$ git push origin 1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa:production
remote: Bypassed rule violations for refs/heads/production:        
remote: 
remote: - At least 1 approving review is required by reviewers with write access.        
remote: 
To https://github.com/Inter-Actief/amelie.git
   63fc753..1ca4c61  1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa -> production

Conner Hof and others added 30 commits May 7, 2026 14:56

Some small bug fixes. It _should_ now work properly!

460d427

Merge remote-tracking branch 'origin/main' into 1079-public-enrollmen…

89b0065

…t-preference

Moved public enrollment feature to the existing enrollments table.

b398a3a

Fixed error for non-logged in users. Fixed the migration. Improved ta…

43751b7

…ble for normal members.

Ongoing declaration model

4518ee2

Added declaration model to personal_tab

09269cb

Added definition to get all mandates for a person

fb60190

Rewrote model for declaration a litle. Added form, url, view, and tem…

33b31a7

…plate for the declaration

Removing extra get_mandates function from members models, as it becam…

8fa272e

…e unnecessary

Adding Declaration email, Treasurer email, and declaration max file s…

b93c41c

…ize to settings

Rewrote model; finished form; added template for the form; added .mai…

4665d25

…l file for the decla email; added cleaner for the form; on save of form an email is sent to the decla email; added admin model; added formview for the form. Did migration for adding the declaration model

Removing unnecessary (format/import) changes to files

63af730

Made pdf generator for declarations which get attached to the automat…

4cc4f67

…ed declaration email

Fixing backend check for filesize. Adding frontend check for filesize…

874ed53

…. Adding frontend and backend check for maximum number of files.

Copied the basic email format and removed the logo, so that it does n…

2775267

…ot get saved in the bookkeeping for each declaration.

Making all committees selectable w in declaration form

b6d389c

Added trans tag for name

46dc77d

Files attached to declaration are now checked for their total file si…

5524f42

…ze instead of individual file size

Removing committee membership check and removing IBAN check when paym…

4b59749

…ent method is something other than 'Bank Transfer'

Adding event listener to hide IBAN fields when Payment Method other t…

0f5142c

…han Personal Bank is selected

Changing document names field to JSONField and adding json loads/dumps

35a0001

Changing email context to declaration object only

43f04d5

email format change

5acafdf

Changing submission date to datetimefield for logging purposes

a64fd31

Adding extra checks for amount (not zero, and larger than zero) and a…

26e9313

… non-blank description

Regenerating migrations

f17c753

Fixing trans tags in declaration.mail

e91246c

Fixing migration by adding dependency that is on main

0694ae4

Moved declaration.mail trans to blocktrans

a8610eb

Matthijs Kedde and others added 9 commits July 25, 2026 00:19

Legacy URL now redirects to new URL

76459a7

Merge pull request #1308 from Inter-Actief/1216-Educational-Cake

b68f93d

Transition from Educational Bouquet to Cake

Translated using Weblate (Dutch)

6b6ebb4

Currently translated at 100.0% (3117 of 3117 strings) Co-authored-by: Lars Kruitwagen <kruitwagenly@inter-actief.net> Translate-URL: https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/ Translation: Amelie/Amelie

Merge pull request #1287 from Inter-Actief/ia-weblate

73f50f8

Translations update from Inter-/Actief/ Weblate

Updated translation files

48dc3a4

Created new urls, forms, views and created/modified pages to support …

b35050a

…adding and editing articles on the price list

Some visual changes

8ec42bf

- removed the category column because categories are an entire row and including the column leaves empty cells - added € to the table header

Redirect back to page you were on when logging in

8f1a089

Merge pull request #1312 from Inter-Actief/1311-auth-redirect

a327a67

Redirect back to page you were on when logging in

github-advanced-security Bot found potential problems Aug 7, 2026

View reviewed changes

Comment thread amelie/personal_tab/templates/declaration/declaration_form.html Dismissed

Merge pull request #1295 from Inter-Actief/dependabot/pip/google-auth…

d0e944f

…-gte-2.49.1-and-lt-2.57 build(deps): update google-auth requirement from <2.54,>=2.49.1 to >=2.49.1,<2.57

Kurocon added 2 commits August 8, 2026 11:35

Merge pull request #1296 from Inter-Actief/dependabot/pip/django-oaut…

d3ad9a2

…h-toolkit-gte-1.7.1-and-lt-3.4 build(deps): update django-oauth-toolkit requirement from <3.3,>=1.7.1 to >=1.7.1,<3.4

Merge pull request #1297 from Inter-Actief/dependabot/pip/pillow-gte-…

1616f0c

…12.1.1-and-lt-12.4 build(deps): update pillow requirement from <12.3,>=12.1.1 to >=12.1.1,<12.4

Merge pull request #1298 from Inter-Actief/dependabot/pip/django-filt…

3b6183b

…er-gte-25.2-and-lt-27 build(deps): update django-filter requirement from <26,>=25.2 to >=25.2,<27

Merge pull request #1293 from Inter-Actief/update-pr-template

bf84451

Updating the PR template

Merge pull request #1302 from Inter-Actief/1301-ended-membership-fees…

3fbc17d

…-selectable-direct-debit Making ended memberships selectable for direct debits

Kurocon and others added 3 commits August 8, 2026 13:00

personal_tab: Add list of inactive articles to pricelist for board, s…

3905e2a

…o they can be re-activated

personal_tab: Make inactive articles list expandable

3ea9b3b

Merge pull request #1309 from Inter-Actief/1254-editable-price-list

1ca4c61

1254 editable price list

iabeheer merged commit 1ca4c61 into production Aug 8, 2026
13 checks passed

Navigation Menu

Repository navigation

Update production - #1313

Update production#1313
iabeheer merged 113 commits into
productionfrom
main

Kurocon commented Aug 7, 2026 •

edited

Loading

Uh oh!

Uh oh!

github-actions Bot commented Aug 7, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

Kurocon commented Aug 8, 2026

Uh oh!

iabeheer commented Aug 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

Kurocon commented Aug 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Aug 7, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

github-actions Bot commented Aug 8, 2026

Uh oh!

Kurocon commented Aug 8, 2026

Uh oh!

iabeheer commented Aug 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Kurocon commented Aug 7, 2026 •

edited

Loading